Merge "Support configuring the protocol in APN settings." into gingerbread