Merge "Calculate grid layout size separately from task size" into sc-dev am: 57e41f9fb7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16ad9dd9d03e15411b1683114904b3cb32175d0a