Merge "Fix first drag to split not working" into sc-v2-dev am: b96a5795fc

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

Change-Id: Ibd3e9b6795744fee80fa643c111121eea46c381a