Merge "Instrumentation: Wait for finish when injecting pointer events" into...

Merge "Instrumentation: Wait for finish when injecting pointer events" into tm-dev am: 4b2317aa am: 9d1bc10e am: ba1226f0

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



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