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

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

Change-Id: If182571d33a18f663a1498e7b7a6c8ec90a217ee