Merge "Use quick settings theme for the privacy chip" into tm-dev am:...

Merge "Use quick settings theme for the privacy chip" into tm-dev am: 6a45e90f am: 3df9163d am: 42536624 am: 8edfa559

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



Change-Id: I9631c408cf6810526a613db99bfd62d5453da4da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>