Merge "Adding privacy indicators to split shade header" into sc-v2-dev am: f5fe79de

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

Change-Id: I4d34eca9768662ea6cc1cfd2471544230ecd8fcf