[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 1804e193 -s...

[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 1804e193 -s ours am: 2027fd55 -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: Ie01d71606e0e3bf598a62e2575195d1eea2a25e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>