[automerger skipped] Merge "Fix stylus hover spot not disappearing" into main...

[automerger skipped] Merge "Fix stylus hover spot not disappearing" into main am: 3bc04bfc am: b85f5231 -s ours

am skip reason: Merged-In I4b04992605ba19bdf3fc5db74580b919ef8356c0 with SHA-1 45b321e0 is already in history

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



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