Merge "Fix issue with drags sometimes not being handled in tests" into...

Merge "Fix issue with drags sometimes not being handled in tests" into tm-qpr-dev am: 315959c6 am: 91ed1021

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



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