Merge "Don't register the binned brightness sensor for disabled displays" into...

Merge "Don't register the binned brightness sensor for disabled displays" into udc-dev am: d4b1f2ee

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



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