Adjust grid options margin and size am: 7c6152f1a8

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

Change-Id: Iddb32bffb24f18b98cdbfca47014cbd3475e79b4