[conflict] Merge "Drag task to left or right edge to enter split select." into...

[conflict] Merge "Drag task to left or right edge to enter split select." into udc-qpr-dev am: bf8019c0 am: 76ee4f73

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



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