[automerger skipped] Merge "Don't register the binned brightness sensor for disabled displays" into tm-qpr-dev am: ce7c4bef3d am: 186c5ff1a6 -s ours am: 37ea5f6833 -s ours
am skip reason: Merged-In I3b1878c9f8fdee8cc21b4adf422afa7539cd84bd with SHA-1 7c182a2397 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21288373
Change-Id: Ie7d9694d4e43d56fa1684a878b6b7407a1ee7f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: