[automerger skipped] Refactor how app pair icons draw am: fcbef122e6 -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: Id9361930be2c584ce63d22050d3793ae577f2703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>