Merge "Fix shortcut size calcuation" into sc-dev am: 372e85106d am: 16c9ebabbf

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

Change-Id: I4fcb9dbb6ffa5b820e09c195775c4f26ff6dd8f3