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

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



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