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

Change-Id: If0d116a9876b1053464613c8af0352d7cfd707a6