[automerger skipped] Merge "Merge Android 12" am: 800112b9 -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 800112b9 -s ours am: 8e22b59b -s ours am: 1ba563eb -s ours am: 4451c431 -s ours

am skip reason: Merged-In Ia86b363c2556ad4999f124cbb9bec21cf0ad58ff with SHA-1 b5baa65c is already in history

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

Change-Id: I527b02fffb2bed821de7968f2d659598f219be8a