Merge "Define IConnectivityDiagnosticsCallback aidl." am: 5f0ff62c75

Change-Id: I113ac797db256699e7e3c8fa89b4230964df08d0