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

Change-Id: Iebda7c3b879749030762185b9d499e7d364502f4