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

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



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