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

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

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



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