[automerger skipped] Merge "Correct color extraction on App Widget drop." into sc-dev am: 25e37a85ae am: 9cfbc67b70 -s ours am: 91948fc3d1 -s ours

am skip reason: skipped by user pbdr

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

Change-Id: If32b2485115187858dfcb900f9907941851d95db