[automerger skipped] Fix ThemePickerLib for use_resource_processor: true am: ca7dde987b -s ours

am skip reason: Merged-In I2e22dc79c41c32198a6870fc953195a8706fb91c with SHA-1 3e0fb7bc5a is already in history

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

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