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

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

Change-Id: I35635e515f1b17b0e908d114fc29c1e2455eb578