[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f78ef769 -s ours...

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f78ef769 -s ours am: 24ab4613 -s ours am: a4283407 -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: I771558d882c91048eb5d5ff334ff39c724e0689a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>