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

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

Change-Id: I5442f4d0f5379f4d9e4b95d94108381907131425
tree: 98a6c4d18001962e60e5bac946571014ae86a878
  1. tests/