Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 8f1c6d2bfd

Change-Id: I5e53fec27728a65e05c7fdf7501dee1052c52e78
tree: fdc1aa9fee7c7260bea9cb92672bb5471268ecc3
  1. core/
  2. services/
  3. tests/