Revert "DO NOT MERGE Revert Privacy Indicators to P"

This reverts commit 5c837108e2509105b8e6d2aabedbbecca8dfc1c6.

Change-Id: I39100ff2adcceff4aff3aef8652fbee859ff565d
4 files changed