Merge "Merge "Revert "Update light/dark detection."" into tm-dev am:...

Merge "Merge "Revert "Update light/dark detection."" into tm-dev am: d88a6933 am: a5f967a2 am: b2d0ee29" into tm-qpr-dev-plus-aosp am: 401872b2

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



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