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: I1dd103bbe957cfd38d2972feb2439b83927918f5