Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: df3fbff25a am: 57c3a0ddaf

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

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