Cleanup for theme picker am: 16c2eb2dd6

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

Change-Id: I32fe7b167023dc2b69e9b9be868f2f4e84a2acdc