Merge "Fix shortcut size calcuation" into sc-dev am: 372e85106d am: c044b3065e am: 152bab8e36

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

Change-Id: I9115255b7dbef2a71ce5223bc5159d7ad2af8d73