Merge "Simplifying color extraction registration logic" into sc-v2-dev am: e6935d895a am: 8b42832709

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

Change-Id: I734859d354b307f2f128c0c9003d33e779080086