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

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

Change-Id: I0ac2bad8f86df32d46ac01811e68bcec85a63785