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