0a358cb1b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966151 Change-Id: Ie9926a3cb4ad383fea8550faf9145733e2668177