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

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

Change-Id: I4ab49de9988e42f1ce63422b214b6405e5839dcd