DO NOT MERGE Remove Privacy Indicators

Bug: 133257910
Test: build and check that behavior is as P
Change-Id: I24bfc3806e2d12f6a1cc968d6979107e7002a3c4
16 files changed