[automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: fc0eed5aa6 am: ede1ab6af0 -s ours
am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 aa7f80a5d8 is in history
Change-Id: I02312f60a1d41a2dcc9e9ba655e7542a450b4ddb
This commit is contained in: