Merge "Merge "Tweak ambient light thresholds." into tm-qpr-dev am: 2d23e546"...

Merge "Merge "Tweak ambient light thresholds." into tm-qpr-dev am: 2d23e546" into tm-qpr-dev-plus-aosp am: c87e231f

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



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