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

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

Change-Id: Iedf444b13c9009d296869beb161ac1614095ae41
tree: 219a0816c398de5826069490cc44eb578e9fa49f
  1. tests/