Merge "Fix ConnDiags Test for invoke-after-validate and unregister CBs." into rvc-dev am: ba9dd48cca am: 0660737884 am: 3e127b8fc1 am: 5812b032d5

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

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