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

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



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