Merge "Globally enable stylus hover icon" into udc-qpr-dev am: d0c510f5

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



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