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

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



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