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

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

Change-Id: I8adc6e98d0ed0e341ec622192c20a6b1bb1b95aa