Merge "Use INJECT_EVENTS permission for UiBench tests" into udc-dev am: 7c82f286 am: cd65ab8c

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



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