Merge "Showing 8 tiles in collapsed Quick Settings in split shade" into sc-v2-dev am: 59f92c57

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

Change-Id: Ic92992045c592ca352b91357c7cebe7e47f0b5a3