Merge "Revert "[Location Accuracy] Turn off the feature for apps targeting S-"" into sc-dev