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

Merge "Revert "Update light/dark detection."" into tm-dev am: d88a6933 am: 4739705e am: b7ad02a0

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



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