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

Change-Id: I802dd638a6dc2abaee5edb08cc44c3024dfba677