Merge "Define IConnectivityDiagnosticsCallback aidl." am: 5f0ff62c75 am: a70650dd73

Change-Id: I2a40892492ba1fa8b55789b7e5cd0cb3a420bc18