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