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

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

Change-Id: I65c176f07d090bdbcfeec22cefdd15e2ea1b2ef9