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

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

Change-Id: Ie21522f976f5acba3a62b98542e5ed956164bcc8