Merge "Fix crash of resource not found (1/2)" into udc-qpr-dev am: 2651111b

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



Change-Id: Ia9d193ca05fee5665d318409c01b4c933f4221f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>