Merge "Update colors for non-v31 devices." into sc-dev am: 7a582f2d7d am: 99843fde0d am: 3b33ac1cbf

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

Change-Id: Ieffa7142c62e2a56bea9a61ca50d0859ba1d0cb7