Merge "Add DeviceConfig flags to Privacy Indicators" into qt-dev
am: 9faaa2733a

Change-Id: I551a9bdf1d246408f1e8bad8cea04201d3392db1