DO NOT MERGE Revert Privacy Indicators to P

Revert Privacy indicators to P.

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