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

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

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