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

Change-Id: Id9694514f9f48f659d7df56f05c5e4492a30de2b