Merge "Add API surface for ConnectivityDiagnostics API."
am: afa0f1756e

Change-Id: I1661e0c1f73a2081ac19e6cca2b1128d4917de90