Merge "Use binned brightness sensor instead of prox" into qt-dev
am: cdc566dfd6

Change-Id: I85007cffbac76c4cf9e66228ec3abfd4c8e8067d