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

Change-Id: I7ca5b8c0792a548ca2d4e6635806a90a1b17a2a9