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

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

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