[automerger skipped] Merge "Address ghost spots that show up after touchscreen...

[automerger skipped] Merge "Address ghost spots that show up after touchscreen is re-enabled" into tm-dev am: 02ecde03 am: badb61b1 -s ours

am skip reason: Merged-In I4fa381da9ca0e285dff4b405cad644fcea840d9e with SHA-1 9eb4e698 is already in history

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



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