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

Change-Id: I03e74dab4e096ac8a9b5fc01dfd90ca745eabf09