Merge "Merge "Fix WindowManagerServiceTests touch tests" into udc-dev am:...

Merge "Merge "Fix WindowManagerServiceTests touch tests" into udc-dev am: c0a3c23a am: a7c1d746" into udc-d1-dev-plus-aosp am: eb0d131c

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



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