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