[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 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: I411c4295715d01ded52649057e9fdd903bb1a4b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>