Merge "Revert systemui status bar provider model behavior" into sc-dev am: afde3f2c

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

Change-Id: I72c2af527eb19715416e9770bf526931a8bf1e73