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

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

Change-Id: Ia140eb64a9cb114871beb02f2dc52ca67fd34fa8