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

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

Change-Id: I982bcf9aaab0d2a596fccafc95ac450371db1015