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

Change-Id: Ie3ece0718017984004ef4fd8303a730c47bd8907