[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-0f53dad1f009493ea42909cd982cb371" into rvc-qpr-dev-plus-aosp am: aea58eb7 -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: I2fb71a62012b552f56b3fa0935801a3950c2e14c