Merge "Reduce icon/text simultaneously when cellHeight is not enough for...

Merge "Reduce icon/text simultaneously when cellHeight is not enough for largest display size" into tm-qpr-dev am: bebeefe9

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



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