[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: 3f41a4a8 -s ours

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

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

Change-Id: Iaf17f0f271c2fffe58dbc3906306d515ef808022