Fix New-QC GPS

We had a portion of this
https://github.com/CarbonDev/android_frameworks_base/commit/112318cba64975e6ef039d345c8e3b3710ffcaf3

Change-Id: I9d3d9bc674d24a942c517340e18a19ef45571c92
Merge "Fix New-QC GPS" into jb42