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

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

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

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