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 am: 6456f3df

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



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