Merge "Support different task icon margin for grid tasks" into sc-v2-dev am: 2683bd7728

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

Change-Id: I554e432e4a06e5fcece33efb39dde074a1873ada