[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp am: 149ef2b6 -s ours am: 22da5095 -s ours

am skip reason: Change-Id I7d98ab425852ffa064c68f5dc50bd1f5a4a49ab9 with SHA-1 472144c3 is in history

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

Change-Id: I8d7e1601bb3d0943d0da103e1568cb31e5129ef4