Merge "Define ConnectivityDiagnosticsCallback IBinder impl." am: 7975dd5796 am: bfc434f9d2

Change-Id: I771e82db91ed72b5263c1ea73a4b36f85e9f4e61