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

Change-Id: I762ac90f485af3c31afadb249f28363f5a34713f