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

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

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