Merge "Add sysprop to force enabling stylus pointer icon for debugging" into...

Merge "Add sysprop to force enabling stylus pointer icon for debugging" into udc-dev am: f3bbc777 am: d9cc8047

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



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