Merge remote-tracking branch 'aosp/upstream-pre-alpha' into update-rules_android am: 219e8b42b9 am: dbcbbb2c9a am: 78dafa3af2 am: 5b733a7bee

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

Change-Id: I96f3664a63711574baa695f0a24a9bde5966a80e