Merge "Enforce ACCESS_COARSE_LOCATION on getCellLocation"