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

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

Change-Id: I2d9e87986dfc3ca4b9fe8fa7c9f24fc37a0fa58f
tree: 84deee763832fa91943ac267409699f3a66a543b
  1. tests/