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 am: 903c1e08

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



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