Merge "Instrumentation: Wait for finish when injecting pointer events" into tm-dev am: 4b2317aa am: 592949bb

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



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