[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-dev"...

[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbb am: d08e9f5a am: 9d17f357 am: 314c69ba -s ours

am skip reason: Merged-In I7e2f95fd85e18127dc481f188ace8ad6effc4831 with SHA-1 281777cf is already in history

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

Change-Id: I8904f10b208b6f2ccfc91523ae01efa48c3e4753