[automerger skipped] Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future am: 037736c1d0
-s ours
am skip reason: Merged-In I64ddf6215ddfe33e180a54bf8a98092da8286808 with SHA-1 3d530c24d7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27908490
Change-Id: I888aa8b72eb3303024560d384f9ae25ee539641c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: