Add back privacy chip am: d074a54435

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12088484

Change-Id: Ie5210c9884715d104ca9be0ae37d39a44f7d80a6