Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 5b8737d5d2

Change-Id: I5e53fec27728a65e05c7fdf7501dee1052c52e78