[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5ba am: b4f80005 am: 2a9b128a -s ours

am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 96895192 is in history

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

Change-Id: I6f717fd3493f20c887ccd8c19e3188d329522002