[automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf -s ours am: b6ef0dc62f -s ours

am skip reason: Merged-In I42565f0acc744669c6c335543a6f1470ad326d4e with SHA-1 42cc5cd651 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2126014

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