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