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

Change-Id: Ic4f1592ae6e9d62abd47734465d4f4638a70576e