[automerger skipped] Merge Android 12 QPR 3 am: 6811cf79 -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: I1f7a548b6869158462e56dff2907f6d7f6445f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>