[automerger skipped] Merge Android 14 am: 5a380349 -s ours am: 91b0c64d -s...

[automerger skipped] Merge Android 14 am: 5a380349 -s ours am: 91b0c64d -s ours am: 1044e849 -s ours am: 20a865a2 -s ours am: 06a1777a -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: I25061737082d1c1c2344a5d0245176e82a6164df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>