am fa699ea2: Merge change 3899 into donut

Merge commit 'fa699ea22a13a92694de75ef948a81da23e71642'

* commit 'fa699ea22a13a92694de75ef948a81da23e71642':
  GpsLocationProvider: Add hooks for GPS location injection.