[automerger skipped] Merge "Refactor how app pair icons draw" into 24D1-dev am: c9ab1dcd98 -s ours

am skip reason: Merged-In I7242e0c525ef578a54a06fb9137fcfc42c6f0e86 with SHA-1 b37faec287 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26741082

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