Merge "Simplify hovering pointer condition" into udc-dev am: 06f057d9 am: d5be2387

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



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