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

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

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



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