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

Change-Id: Iaa36b7036d916ef7a48314a3dfa224750e720c62