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

Change-Id: I2b63b2140106d34f8c5274de28db63579f481d74