Sort grid options in onegrid

We need to make sure that the new grid options are sorted by column
count from greatest to least

Bug: 395086953
Flag: com.android.launcher3.one_grid_specs
Test: manually verified
Change-Id: I94fbf0fe74fa7dfc92afc64be92cdf511b79e763