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

Change-Id: I1d60026a7b31af2bc329187685780744c20d7c8c