tree a58049c9682d6fd38e8408479340bf3911b87515
parent 8d58e75763b3b83025a5d9402750b2033e184474
parent 2cec01026035db73c124100fa37115758f43e603
author Romain Jobredeaux <jobredeaux@google.com> 1696881728 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696881728 +0000

Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 39292a3354 am: 3956589553 am: c86e585873 am: fcbd2d1e8b am: 2cec010260

Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-rules_android/+/2777173

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