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

Change-Id: If024d420e5285edce10b136fe1cc1f13ec3df46c