[automerger skipped] Merge "Folder icon polish." into sc-dev am: 46378eb881 am: 076ee3dcfc -s ours

am skip reason: Merged-In Id49bae33438e10248bef05450d7e2c92c2140748 with SHA-1 2cc564c647 is already in history

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

Change-Id: Icc03ef62f6b0b078312b34d9fa97e4d2b5b27ac3