Merge "Address ghost spots that show up after touchscreen is re-enabled" into...

Merge "Address ghost spots that show up after touchscreen is re-enabled" into tm-dev am: 02ecde03 am: d34c7267

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



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