Merge "Merge "Make screen events internal instead of AIDL" into udc-dev am:...

Merge "Merge "Make screen events internal instead of AIDL" into udc-dev am: a9d7a0f0 am: 46880545 am: 4f2570fc" into udc-qpr-dev-plus-aosp am: 4e94cd00

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



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