Merge "Update use of A-GPS modes in GpsLocationProvider b/20664846" into mnc-dev