[automerger skipped] Merge "Merge Android 12L" am: c7c0b9e4 -s ours am:...

[automerger skipped] Merge "Merge Android 12L" am: c7c0b9e4 -s ours am: 8ee748f0 -s ours am: 6cf8bb48 -s ours

am skip reason: Merged-In I3b9c8a3d4d36cc03b6648b2c7a7b5a10706ec87d with SHA-1 97fe2742 is already in history

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

Change-Id: I2465fbe278c3bdbe5ec7092309a898c682183e2b