[automerger skipped] Merge Android 12 QPR 3 am: b9c0077a29 -s ours am: cd0337c968 -s ours

am skip reason: Merged-In I8e4fe40207cbb896019ff8e145b407034abf318c with SHA-1 d938ae76ec is already in history

Original change: https://android-review.googlesource.com/c/device/google/bramble/+/2126115

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