[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: cdbd933c63 -s ours am: 613dc20d0c -s ours

am skip reason: Merged-In I6547e4f0bd53b01db7b3cd5ec95aa80a74f73675 with SHA-1 e4adf75c68 is already in history

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

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