Merge "Fix unit test to allow ThemePickerTests to run as presubmit" into tm-qpr-dev am: 1960acc3

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



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