Merge "Add API surface for ConnectivityDiagnostics API." am: afa0f1756e am: eb3bae3d11 am: 1a7bc730ee

Change-Id: Id7191b7b625a4026feb7f752c7475011a3adbf52