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: 6d7fb493

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



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