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

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



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