[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: afb99ffd -s ours...

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: afb99ffd -s ours am: 7accd0dd -s ours am: 88146d8b -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: Ic24ff5fe219b9310fd4f1b17ed503a1f975ac7f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>