Merge "Fix jumping slider in split shade" into tm-qpr-dev am: 2dca8120

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



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