Merge "Don't call ConnectivityService when holding ActivityManagerService lock."