Merge "Fix contrast issue with folder background and text colors." into sc-dev am: d75f89c6c0 am: a5ae0dd666

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

Change-Id: I917d7047c092279378fd6925ba1d30912ed21697