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

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



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