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

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

Change-Id: I8ee6bb2b7abcd9d4f5f59cf53b72cf1637a7544c