Merge "Removes "reset" button from shortcuts screen." into tm-qpr-dev am: 88cd1a6196

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

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