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

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



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