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 am: eec4780f

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



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