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 am: 61994979

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



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