Merge "Disable grid option feature in ThemePicker" into rvc-dev am: cb2473cf3f

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

Change-Id: I97165e800e5dc275aeb4924f49f38ae90e4ab775