[automerger skipped] Merge "Don't register the binned brightness sensor for...

[automerger skipped] Merge "Don't register the binned brightness sensor for disabled displays" into tm-qpr-dev am: ce7c4bef am: 186c5ff1 -s ours am: 37ea5f68 -s ours

am skip reason: Merged-In I3b1878c9f8fdee8cc21b4adf422afa7539cd84bd with SHA-1 7c182a23 is already in history

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



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