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

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

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