[automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: 91af7c65f0 am: 025fe2242d am: fbd6544a14 am: 5e37b478c0 -s ours

am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 69fad4c721 is in history

Change-Id: If4c7a8904796a82c7f57ba597d48e86b1b0829b9