Merge "Polish folder icon bugs." into sc-dev am: 835fab2305

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

Change-Id: I2fe56985b583fd76b73b4fe1a98c6234d24c53e3