Merge "[TP] App grid support for reset (3/4)." into tm-qpr-dev am: f74b465c am: 2cbc3d83

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



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