Merge "Fix ConnDiags Test for invoke-after-validate and unregister CBs." into rvc-dev am: ba9dd48cca am: 0660737884 am: c93c32f2d2 am: ced95870e2

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

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