[automerger skipped] Merge "Ignore non-matching callbacks to fix flakiness" into rvc-dev am: 7117a52f6e am: 6d358e33ab -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: I120048bfcc50d0bf202f9cae5b7b3659c82b422e
tree: c6df1ba5176117fd7b0ff9efb9e52dafd7cab362
  1. tests/