[automerger skipped] Merge "Ignore non-matching callbacks to fix flakiness" into rvc-dev am: 7117a52f6e -s ours am: e985f78ec8 -s ours am: ae51b342e9 -s ours am: 5142895f29 -s ours

am skip reason: Change-Id I67c685ebfb2c5e2ee6f7615196eedea8292ca3ff with SHA-1 b6f64fb76c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12121966

Change-Id: Iac85e9011e2de259e0678d737253349435ccb283
tree: 242a2564510ce804756ea3a76905cc978735a2f1
  1. tests/