Merge "Update location permission check for ConnectivityUtil"