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

Merge "Merge "Disable grid option feature in ThemePicker" into rvc-dev am: cb2473cf am: 15816e2c" into rvc-d1-dev-plus-aosp am: ab0f8427 am: af2adcd7

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

Change-Id: I4b758c67c31b1be613b08b577c7e3aa71934ec64