Merge "Fix wrong split layout after drag drop" into tm-qpr-dev am: 99933f97 am: 55b28daa

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



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