Merge "Add a new carrier config to show the WFC location privacy policy UI"
am: 4c508d1b03

Change-Id: I1b3c96de78b909dab372e3e3745c877b8becd2d6