Revert "Revert "Add support for Samsung extended AGPS""

This reverts commit 3e99bab16abb0ba4682ef7040e0e5702638b026b.

Change-Id: Ia9850aecf0dff6276de94d4762a2b5c4c8f0aa9d
Fix some merging mistakes

Change-Id: Ia3a96151e493efad63cb56ffb9446cfc20da705c