[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "bug158482162_rvc-qpr-dev-rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp am: 50ce57e5 -s ours

am skip reason: Change-Id I58e5d2a0b438296137fd76720636c8fdce740ded with SHA-1 7671f0d9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39934960216724479b7b3fecd55050a66494c783