Merge "Add a new carrier config to show the WFC location privacy policy UI"