[automerger skipped] Merge "Revert systemui status bar provider model...

[automerger skipped] Merge "Revert systemui status bar provider model behavior" into sc-dev am: afde3f2c am: 0be6a8b0 -s ours am: 4fdfdca8 -s ours

am skip reason: Merged-In I017c10e4d7c1b15b152c44d092695dbc77e4a0ec with SHA-1 30a2c5b0 is already in history

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

Change-Id: I19a8cb127edd4eccb518d623d78e65b5787ff808