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

Change-Id: I0a6239d23fdc484ae54238c5cfff30f69ea40e81