Merge "Merge "Assume sensors perform prox check" into qt-qpr1-dev am: e28124af92" into qt-qpr1-dev-plus-aosp
am: 4b8e02d15b

Change-Id: I8440d2ea116495209f2fb76ff73c299d5d13c4f6