[automerger skipped] Merge "PointerIcon: Add leniency to hotspot validation...

[automerger skipped] Merge "PointerIcon: Add leniency to hotspot validation for scaled icons" into main am: 8a83c38b -s ours am: 41760221 -s ours

am skip reason: Merged-In I4af5d6619aa7f5245054047ad079694b11919754 with SHA-1 22057839 is already in history

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



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