gps.conf: underp

Restores prevision version of gps.conf with the added geofence bits

Change-Id: I99e5e08c40ec986b6671f082390817ab86120348
Merge remote-tracking branch 'upstream/cm-10.2' into HEAD