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

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



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