Merge "Revert to previous constant value for ApnSetting.TYPE_DEFAULT."