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

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

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