Merge "Moving brightness slider lower in split shade" into tm-dev am: cd2ba609

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



Change-Id: Ie2d84fd566c615ae1d9088f40810a4d45eaff16b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>