Merge "folderChild icon and text size should follow the respective...

Merge "folderChild icon and text size should follow the respective configuration" into tm-qpr-dev am: 37292eb2 am: 369fd22f

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



Change-Id: I7734c8503df63eb16a34ee75e33f100940d386aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>