Merge "Fix not able to launch multi-instance with drag and drop gesture" into...

Merge "Fix not able to launch multi-instance with drag and drop gesture" into tm-qpr-dev am: 5e5d3a15 am: f72b89e1

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



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