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

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

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