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

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

Change-Id: If4443e3a69041d48d8e8cc1e23687e576bb01876