Merge "Folder cell should match grid cell aspect ratio if isScalableGrid is true." into sc-dev am: f072b062a2

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

Change-Id: Ibbdcb057ab318c19834c89722abf2b2ef948f196