Merge "Throttle location update rate in proximity alert" into oc-dev am: 23a66d44ea
am: 2307be9c47

Change-Id: If946fae16c1db2038f752a4837d5fb9ac0e14a2e