[automerger skipped] DO NOT MERGE Revert "DO NOT MERGE Remove Privacy Indicators" am: 53ceaf677a
am: efc4b3a7ee -s ours
am skip reason: subject contains skip directive

Change-Id: Ia327a10e460bdb693e5c4ff0a52a2435be327992