Merge "Fix task missing after dropped an app in PIP to enter stage split" into sc-v2-dev am: 338f6e29db

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

Change-Id: I9a470eafdec084e5bef027d47c307af081dae2df