Merge "AOD: Proximity check doze triggers" into oc-dr1-dev