[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into...

[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: c6affe2f -s ours am: e6a6ae17 -s ours am: 9682bb52 -s ours am: 932076b6 -s ours am: 16e80268 -s ours

am skip reason: Merged-In Ida22f0ccbfc886f741a4c3308027922c47ae0529 with SHA-1 7662640b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/17537340



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