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

Change-Id: Idf067ebd9299ca036965b7c7f82c13a6f659a821