Unbreak the APN editor

Change-Id: I4f0b27628539473381fb28b6d60dd5eacd8e1fd4

Conflicts:
	src/com/android/settings/ApnSettings.java