DO NOT MERGE Disable privacy indicators

Test: manual
Fixes: 180018342
Change-Id: Ia5057e23a9974ef8ff3652c50adc0216844a7099
3 files changed