Merge "Promote ApnSetting to com.android.internal.telephony."