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

Merge "Merge "Use quick settings theme for the privacy chip" into tm-dev am: 6a45e90f am: 3df9163d am: 1459dffd" into tm-qpr-dev-plus-aosp am: ee88f0e5

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



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