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

Change-Id: I88ab7b749860a0f94857743ba759bb47270857f6