[automerger skipped] Merge "Making multiuser button work in collapsed QS in split shade" into sc-v2-dev am: 45a1fc00 am: 5d6a2b30 -s ours

am skip reason: Merged-In I76c9bb77c870b8a1a4e25221c63821786057d7f2 with SHA-1 057defb0 is already in history

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

Change-Id: Ib5a3058d0e67349818e0210edb2e7163d78ce378