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

Merge "Merge "Update light/dark detection." into tm-dev am: 4e6dfca5 am: 8a21df0c" into tm-d1-dev-plus-aosp am: 76c2b53d

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



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