Merge "Fix an issue where the pointer could be invisible" into tm-qpr-dev am: 9f5ed9f3

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



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