Merge "Improve local color extraction handling." into sc-dev am: 4049f539c2

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

Change-Id: I3290ed00b8852f84d32e5f6842cd950f0b8e0172