Merge "Custom LPP AGPS config for Rogers" into nyc-dr1-dev
am: e13df588a4

Change-Id: I461a69d477f540424b40ed76cba11bfaabbcabb8