Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 5b8737d5 am: fc04c384 am: b52e9ce8 Change-Id: Iec4dcf4c39edb8994ed72b9550845ea5962e836a