[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: f04c496b am: d90941ca am: ff5100d3 am: a5ea9084 -s ours am: 42c7db42 -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: I3b3c957ebd6b26a52066bd0e2c2e6c3da8e95f68