Backporting the change of ag/15629060 to pi-dev am: 95ff59db3b

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

Change-Id: Ibd3803cbca8dbc9ce44f5982f84a5e81b840c1bc