[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 7e46832a1c
-s ours
am skip reason: Merged-In I0b63516865233df0bf125a2ee4098769a8991ecd with SHA-1 88763e8e40
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2989879
Change-Id: Ia1d6e85efdb9af29df0abac89b9f21dba52685fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: