Merge "Add CTS tests for ConnectivityDiagnosticsManager." am: 8db173d81e am: 85d5461834

Change-Id: I0cb2d43fd332558a8c509800c0e2a878c14e521c