[automerger skipped] Merge "Clean up unit testing for...
[automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: 91af7c65 am: 025fe224 -s ours
am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 69fad4c7 is in history
Change-Id: I02312f60a1d41a2dcc9e9ba655e7542a450b4ddb