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

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

Change-Id: Ifa9d4b1a94c0c7b824d64c32fa27510c1535fa94