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

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

Change-Id: I9d11919be931a98753c024da44ecfdd030d05604