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

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

Change-Id: Ia64c4ff1b043f06d23708eb0e07d903c7b8bc4b7