[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-8fe1bfad79f84157a29ab2e38769dd1e" into rvc-qpr-dev-plus-aosp am: 1bfde096 -s ours

am skip reason: Change-Id I7a240621267648ea54e7dc737ebc55bc665e39b6 with SHA-1 346eed73 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb9cc9164046f0003ae8ae1753ec731a0c78288a