Merge "AOD: Pause sensors while proximity is covered" into oc-dr1-dev