Merge "BrightnessTracker should accomodate multiple ambient sensors" into tm-qpr-dev am: 5cb3c557

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



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