Merge "Correct # of cells estimation that can fit horizontally in widgets picker" into sc-v2-dev am: c352b92aff am: 22c50516dc

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

Change-Id: Id66dff61d0944a2b62d842c2ee18eb3edc29fdf0