Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks."