Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1293900 Change-Id: I8d8a84119ee36cb93be2f18cf2a03c576cf0ecd2