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

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



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