[automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb -s ours...

[automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb -s ours am: 0a5d8bac -s ours am: 64e0299e -s ours am: 6a3d1e34 -s ours am: 1f526218 -s ours

am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e3347 is already in history

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



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