[automerger skipped] Merge "Adding privacy indicators to split shade header"...

[automerger skipped] Merge "Adding privacy indicators to split shade header" into sc-v2-dev am: f5fe79de am: dfdc3dcc -s ours

am skip reason: Merged-In I80e1e808d54c4da1b91a38e8140430edf5a57504 with SHA-1 a0f94cfe is already in history

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

Change-Id: Ia2c44d161f9164d86393fbfb205cae00488a339c