Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: 91af7c65f0

Change-Id: Icff8ed1cf90927e521c8294aaec8bfdd6a4ccc4d