Merge "Fix couple of drag and drop issues from transient taskbar" into...

Merge "Fix couple of drag and drop issues from transient taskbar" into tm-qpr-dev am: 974cdc68 am: c34f0379 am: 48a749f0 am: a58b2f18

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



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