[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: c04229bb -s ours

am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f is already in history

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



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