Backporting the change of ag/15629060 to pi-dev am: 95ff59db3b am: e317818b24 am: 8f758cff77 am: 30d1571a99 am: 5b9145dd18

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

Change-Id: I487a0850c280f68685e430163807c7c2a95515ef