Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am:...

Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbb am: d08e9f5a am: 9d17f357 am: 074f2504

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

Change-Id: Iaeed9146ae74e297413b5924528aa491feb91edc