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

[automerger skipped] Merge "Merge "Address ghost spots that show up after touchscreen is re-enabled" into tm-dev am: 02ecde03 am: d34c7267" into tm-d1-dev-plus-aosp am: 5097c5e5 -s ours

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

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



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