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

Merge "Don't register the binned brightness sensor for disabled displays" into tm-qpr-dev am: ce7c4bef

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



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