Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 20475333ee am: 36c23a4a19 am: adb5cee483 am: a40e5383d6 am: 55848a95b2

Original change: https://android-review.googlesource.com/c/pl

Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 20475333ee am: 36c23a4a19 am: adb5cee483 am: a40e5383d6 am: 55848a95b2

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

Change-Id: Iaae49adb2c0655431630825fc21f8b676b73cc64
Signed-off-by: Automerger Merge Worker <[email protected]>

show more ...