Merge "Support shorter height row layout / Disable ICON_SLICE" into sc-dev am: aa793ff226

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ae00831bc2b48ab35533845cd887698471a85ef