[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbbcc am: d08e9f5aad am: 9d17f35793 am: bc87970e57 -s ours am: 1be8335d2f -s ours am: 49e9792866 -s ours

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

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

Change-Id: I9479855c9fc5ad313cd3a58df869df8bdd5a7f1d