tree fb4ce8ff451007b17df3094f955fe6d341186bf0
parent b610a0ec58eeaf54e65f7ebf791e1a74a8718fc0
parent 57c3a0ddaf118acee308ebbd240fa80300bcf9f1
author Sam Delmerico <delmerico@google.com> 1683751197 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1683751197 +0000

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>