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

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

Change-Id: I75573be2943473a335175fd2fbd60deaacd7d35e