[automerger skipped] Merge "BrightnessTracker should accomodate multiple...

[automerger skipped] Merge "BrightnessTracker should accomodate multiple ambient sensors" into tm-qpr-dev am: 5cb3c557 am: fd0cc436 -s ours

am skip reason: Merged-In I9807ecb39ac8962d2dae9e53c68e6eadbba5c50f with SHA-1 65e1555f is already in history

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



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