[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: d74507e2 -s ours

am skip reason: Merged-In I9d5b022abee730aa5f07a8cfa87bcae59572d653 with SHA-1 fe5fbedb is already in history

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



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