[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 udc-dev am: d4b1f2ee am: b5cea3fe -s ours

am skip reason: Merged-In I3b1878c9f8fdee8cc21b4adf422afa7539cd84bd with SHA-1 3e25eee9 is already in history

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



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