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

Change-Id: I4d32b2e66a04cdff97f33220416f457b6fb3ed0b