Merge "Showing brightness slider in collapsed QS in split shade" into sc-v2-dev am: 93148349

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

Change-Id: I169313fefd23c01771de3342829530d0c48453ab