Merge "Add back the SUPL network setup timeout."