[automerger skipped] Merge Android 14 QPR1 am: 41968c6c -s ours am:...

[automerger skipped] Merge Android 14 QPR1 am: 41968c6c -s ours am: 5338078b -s ours am: 14088676 -s ours

am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef is already in history

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



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