gps.conf parameters are in sap.conf table

due to merge issue, some of the parameters to come out
from gps.conf are placed in the table that expects from
sap.conf. Moving them into the right place.

Change-Id: Ice988b06d0d87bdbc0225296898d6aaad701743f
CRs-Fixed: 760152
Merge "gps.conf parameters are in sap.conf table"
Merge pull request #2 from AOSParadox/LA.BF.1.1.2_rb1.10

CAF UPDATE : LA.BF.1.1.2_rb1.10