[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: f9c71eed93 -s ours am: 10a5c3a58e -s ours

am skip reason: Merged-In Ie1b27d286785c75292449886030bd6420b5a2c6d with SHA-1 a4e62a8cdf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17544718

Change-Id: Ia43fabcbc95d6c7b030ca3c0e4afbb145f5a9328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>