Merge "launcher: create attrs for more horizontal margin options" into sc-v2-dev am: bfb6996484

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

Change-Id: I69a26b4bf883f71917690a08249d85350b4bcbc3