Merge "Allow SUPL to use restricted network in emergency" into tm-dev