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

Change-Id: Ibc046d27c748da60f051074c141a533862a934ea