Merge branch 'mirror-aosp-main' into udc-mainline-prod am: bda29b58bc

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/gradle-plugin/+/25841155

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