[automerger skipped] Merge "Folder polish - update color extraction, fix contrast issues." into sc-dev am: 11bf817e86 am: 5fff945c93 -s ours

am skip reason: Merged-In I230c33d7e4e1871d8d702737c56c79ce46504b8f with SHA-1 8644368e08 is already in history

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

Change-Id: I8a388d907c92214467d80a1e38882210a07fe4d8