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: 10cb8c75 am: fdaea9c9

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



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