Merge "Add callback registration in ConnectivityService." am: e534c45250 am: 52309b9871 am: dcc5a26aa0

Change-Id: I596d4788f6d35f1adf110d8edd390f5632b4dc06