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

Change-Id: I98a0e22fcc965f8bbbbfd69908c8ca40401c2e37