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

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



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