Merge remote-tracking branch 'aosp/upstream-pre-alpha' into update-rules_android am: 219e8b42b9

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

Change-Id: I62b988b1dc694fa6bc5fa6040b792bc34dc8dc77