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

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



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