[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 1a409255 -s ours

am skip reason: Merged-In I23b7f7e8a1b43bbd5f49012c95a130d91098f92a with SHA-1 e8e66b8a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27908489



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