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

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



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