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

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0bb254bd -s ours am: 2a747fd0 -s ours am: ce51bea8 -s ours

am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544891



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