Merge "Revert "Revert "Turn on the feature flag for Android S Settings.""" into sc-dev