Backporting the change of ag/15629060 to pi-dev am: 95ff59db am: e317818b...

Backporting the change of ag/15629060 to pi-dev am: 95ff59db am: e317818b am: 8f758cff am: 30d1571a am: be868a5a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748731

Change-Id: I2cfdd39a6bb5d9ccade58de65ae6834409c9d632