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

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

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