Merge "Fix folder icon text alignment." into sc-dev am: 48dbfcd1c8 am: 66e6d991df

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

Change-Id: I62991969bea1db6c0166955c3225de9eb7c89c7b