[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-c6168f81c15b4bdc8b95f05dbf2b9ba8" into rvc-d1-dev-plus-aosp am: 5e1ec58a -s ours am: bcda3722 -s ours

am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 83f6a384 is in history

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

Change-Id: If5412dd79954536f3b2d903ff0e3d5eaa40f35b1