Cleanup for theme picker am: 16c2eb2dd6 am: 0d4c930c73

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

Change-Id: I583d3f6949e82b8cb9e8e0ba35a60340ab26e73a