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

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

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