Merge "Fix unlocked split shade jumping back into place after over expanding"...

Merge "Fix unlocked split shade jumping back into place after over expanding" into tm-qpr-dev am: 2429c980 am: 5a9624dc am: d0879020

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



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