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

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

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



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