[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: e693b503 -s ours

am skip reason: Merged-In I21eb7d5dc8cef9c1dd797ba1ab2ee830a8a5a42b with SHA-1 0942f741 is already in history

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



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