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

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



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