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

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



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