Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread