[automerger skipped] Merge "DO NOT MERGE Revert Privacy Indicators to P" into qt-r1-dev am: e8c61a23f8
am: f880f9e11a -s ours
am skip reason: subject contains skip directive

Change-Id: Idd904e8502d3c04716f65898c1c38b6022948d94