Fix create duplicated custom bug am: ea7427c632

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

Change-Id: I6588def46dc274928ead4de473bec94f724768b4