Merge "Fix icon text size being calculated in DP instead of SP." into sc-dev am: fb7b9fd8c3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I546325f3b0b6ccc0efb892c8dae239cdaf9b178c