[automerger skipped] Merge "DO NOT MERGE Revert "DO NOT MERGE Remove Privacy Indicators"" into qt-r1-dev am: 005993172f
am: 8de17988df -s ours
am skip reason: subject contains skip directive

Change-Id: I26df8408847cbfcbd57bb619461c19f618f92e20