[automerger skipped] Merge "Configure existing ThemePicker Robolectric tests...

[automerger skipped] Merge "Configure existing ThemePicker Robolectric tests to run with atest." into tm-qpr-dev am: f3bfb5f2 -s ours

am skip reason: Merged-In I25c4efdb73dc5eb88611efac669de13fa2be0c3d with SHA-1 9a9c7c18 is already in history

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



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