[automerger skipped] Merge "Fix ConnDiags Test for invoke-after-validate and unregister CBs." am: 58af3db73e am: 9a17cc9f1c -s ours

am skip reason: Change-Id I1836536fe60a65ba33170cd80e8f4996f1965d19 with SHA-1 cce29fc44d is in history

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

Change-Id: I80bad133fa77c78334bf4d8c9d98097d7f5846fd
tree: 9a9aac2ceddfbf1e273ee7bdd3f26c36216c7eec
  1. tests/