4f40f1c1f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597111 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I365552952f71b85e6ebbc517eb87081361d61d2c