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" into udc-d1-dev-plus-aosp am: 582dac06

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



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