[automerger skipped] Merge "PointerIcon: Ensure bitmap size and hotspot are...

[automerger skipped] Merge "PointerIcon: Ensure bitmap size and hotspot are scaled consistently" into main am: 4c88a552 am: 106e75a0 -s ours

am skip reason: Merged-In I375008e5603a9e50e4e7132c8faffda3a1cdd765 with SHA-1 626edb8f is already in history

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



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