Merge "Fixes lock screen live preview in color picker" into udc-qpr-dev am: b0d5d750

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



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