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

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

Change-Id: I59fdfa471d8f29524179517cee156baf006ee512