Merge branch 'mirror-aosp-main' into udc-mainline-prod am: bda29b58bc am: c192b9e34b am: 53313c5f11 Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/gradle-plugin/+/25841155 Change-Id: I4ddc8fe8412dde6fa71fb9554127a5805bcdea5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>