Merge "Update app grid options after changing grid" into tm-qpr-dev am: e4e1bfa523 am: d53bef13f6 am: 087f6b3ab2 am: 366ae8226b

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

Change-Id: Ia6b55339ef57ac1513c5397a63fc80b53ce2169c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>