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

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

Change-Id: Ia680af59bb5ec24203f6e61ee562c4907a4dbde1