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

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



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