Merge "Use INJECT_EVENTS permission for UiBench tests" into udc-dev am: 7c82f286 am: adc34ff4 am: c92cbca1 am: 5328cede

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



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