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

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



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