Merge "Conform the logic to decide wallpaper darkness" into udc-dev am: 4f7f216c1f am: cafa5cf810

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

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