Merge "Conform the logic to decide wallpaper darkness" into udc-dev am: 223a0a22 am: 175850f9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23617998



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