[automerger skipped] Merge "Add a new carrier config to show the WFC location privacy policy UI" am: 4c508d1b03 am: d94791b712
am: 516b07ee2c -s ours
am skip reason: change_id I58df76ae97b54009b55a7a78fcaec95cd9b27ca6 with SHA1 7f3a9d08c6 is in history

Change-Id: If02ed9c640ad95115d27579f5357ff540caf4341