Merge "Fix WFC location privacy carrier config" into qt-dev am: 1923b35e15
am: e4e5ec04a7

Change-Id: I6100098b849fd1453060a91d85c94ecea51d72cc