Merge "Fix privacy indicators in QQS with new headers" into tm-qpr-dev am: 6b311488

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



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