Merge "Allow LOCATION_BYPASS permission to be used for location" into main