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

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

Change-Id: I9aa2bcdcc4af8bc54a1d331c0aa2f709bad743c5