Merge "Assume sensors perform prox check" into qt-qpr1-dev
am: e28124af92

Change-Id: Ic155582a43bdee1b9d7a225e39d22399837864e5