Merge "Clean up some useless code" into sc-dev am: ab4c46aac0

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

Change-Id: I5d99e27ae810517dde42942cab79e9d841627c7e