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: Id5684eeab5e56461eeeb60e23c37221afeb2b4dc