[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into...

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

am skip reason: Merged-In I0cad070975c74c1a4814f0e434f93ad81f6e676e with SHA-1 9097c5ea is already in history

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



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