Fix create duplicated custom bug am: ea7427c632 am: ea1911dd0d

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

Change-Id: If5bd4b7f6db0ebdd7df9540dc929667fa300d6e8