Merge "Fix a few issues with mouse cursors and resize handles" into...

Merge "Fix a few issues with mouse cursors and resize handles" into udc-qpr-dev am: 34ca8b1c am: 5f08a299

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



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