[automerger skipped] Merge "Merge Android 12 QPR 3" am: 195b02b5 -s ours am:...

[automerger skipped] Merge "Merge Android 12 QPR 3" am: 195b02b5 -s ours am: ec8f45f6 -s ours am: 21fc567c -s ours

am skip reason: Merged-In Ia6e09648c74410ce5d14dd6b2032e59466034cb5 with SHA-1 0a3e8a46 is already in history

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



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