Merge "Adapt all screen previews to recent changes (2/2)" into udc-dev am: e4d2f9aa38

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

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