Merge "Prevent new instance if drop on split-screen with the same app" into...

Merge "Prevent new instance if drop on split-screen with the same app" into tm-qpr-dev am: 3d3bf180

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



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