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

Merge "[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbb am: f04c496b am: d90941ca am: 581ed870 -s ours am: 09026442 -s ours" into sc-v2-dev-plus-aosp am: 57fe0dea -s ours

am skip reason: Merged-In I7e2f95fd85e18127dc481f188ace8ad6effc4831 with SHA-1 8f005ffe is already in history

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

Change-Id: If1eb8cc840ab93c43e3ae4007a9d6400542bedc9