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

Change-Id: I2f1b030e7955d93b8ba2af0d906c212b925a8cc7