[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: a27bc483ba -s ours am: 35bc61390e -s ours am: 845fa1fb59 -s ours am: f06a69913f -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: I2fa9c4950897840082ff3ba9fde8ff7440c65f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>