24f5475996
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354482 Change-Id: Ieaf44ea19965b4c0ba9fef0cc2dfe9844ba0b3a2