Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE