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

Change-Id: I5a77211d1f940166c02c4aac31c9add9466c76b1