Merge "Clean up unit testing for ConnectivityDiagnostics." am: dc95e019 am: f68f0b14 am: bd48f4f1 am: 9ee80b2a Change-Id: If31027920ff925d0043b59bb128cf042a329183f