Merge "Do not update PointerIcon when stylus is not hovering" into udc-dev am: ce3bd36b7e am: 7430050e88

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

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