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

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

Change-Id: I7406da39c9a8535a34082905be7a313bf54aae01