Merge "Ignore non-matching callbacks to fix flakiness" am: 2e2642f909 am: b02ea3ecdd am: a4ad47a46b

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

Change-Id: I846384d1b0f1fdcac6174e40fad269e17743d712
tree: 757e720324a31d1fb64a208838f2f004cd5e19a1
  1. tests/