Merge "Fix ConnDiags Test for invoke-after-validate and unregister CBs." into rvc-dev am: ba9dd48cca am: 30e195dae3 am: d2fee86418 am: 3d2e2e1e1f

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

Change-Id: I2a58d37a000e33a160f3d85c27c519179ac90327
tree: 3fb848e13ac5f0e6c309aee8eaa782a45384b582
  1. tests/