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

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



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