Merge changes from topic "dispatcher-hit-test-logical-display" into udc-dev...

Merge changes from topic "dispatcher-hit-test-logical-display" into udc-dev am: 54942141 am: 1455e6ae

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



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