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

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

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