Merge "Fix ConnDiags Test for invoke-after-validate and unregister CBs." am: 58af3db73e

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

Change-Id: I6bb3f71a4d919026d768c7e443afeb30cd928998
tree: 899b7690f91646fff289b9d8f758432178d7acc2
  1. tests/