Merge "Polish folder icon bugs." into sc-dev am: 835fab2305 am: 9bf19c1d7f am: 8d035dfbc0

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

Change-Id: Ic443c7c276d7a0442ac7e510d0322438fd8ab0fc