Merge "Update app grid options after changing grid" into tm-qpr-dev am: e4e1bfa5

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



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