Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbbcc am: d08e9f5aad am: 9d17f35793

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

Change-Id: I675710bfc75632eb5841b23495850592155d4657