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

Change-Id: Ia6f40680c30ea1271d664173805a7b4fcef4b7f0