[automerger skipped] Merge "Ignore non-matching callbacks to fix flakiness" into rvc-dev am: 7117a52f6e am: 6d358e33ab -s ours am: 829749a2a5 -s ours am: ec6ea585a3 -s ours

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

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

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