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

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

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