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

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



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