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

Change-Id: Ic85bd4ffcdfe904d685b84b41e15239f724bd984