Merge "Fix ThemePicker crash on launch" into udc-qpr-dev am: 95e5c0f8 am: 0e777724

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



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