Merge "Replace tasks in the same split with the dropping app" into sc-v2-dev am: 3d13d0cb

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

Change-Id: I3a44d7e2ba54148672caabc9debbc89019089c57