Fix ZAP CI failure.

[bzbarsky-apple]

Merge conflict led to the checked-in generated code not matching what gets generated from the templates.

[github-actions]

PR #23096: Size comparison from 3b96652 to 2dc3bdd

Increases (5 builds for bl702, telink)

platform	target	config	section	3b96652	2dc3bdd	change	% change
bl702	lighting-app	bl702	.debug_info	37905288	37905289	1	0.0
			.text	957032	957034	2	0.0
		bl702+rpc	.debug_info	41811900	41811901	1	0.0
			.text	1030732	1030734	2	0.0
telink	light-switch-app	tlsr9518adk80d	text	553142	553146	4	0.0
	lighting-app	tlsr9518adk80d	text	571366	571368	2	0.0
	ota-requestor-app	tlsr9518adk80d	text	577548	577550	2	0.0

Full report (10 builds for bl702, linux, mbed, nrfconnect, telink)

platform	target	config	section	3b96652	2dc3bdd	change	% change
bl702	lighting-app	bl702		0	0	0	0.0
			(read only)	3262	3262	0	0.0
			(read/write)	1188659	1188659	0	0.0
			.bleromro	6296	6296	0	0.0
			.bleromrw	124	124	0	0.0
			.boot2	688	688	0	0.0
			.bss	67102	67102	0	0.0
			.bss_psram	29696	29696	0	0.0
			.comment	48	48	0	0.0
			.data	4272	4272	0	0.0
			.debug_abbrev	1506865	1506865	0	0.0
			.debug_aranges	133128	133128	0	0.0
			.debug_frame	486580	486580	0	0.0
			.debug_info	37905288	37905289	1	0.0
			.debug_line	5256840	5256840	0	0.0
			.debug_loc	3367112	3367112	0	0.0
			.debug_ranges	359368	359368	0	0.0
			.debug_str	3457811	3457811	0	0.0
			.hbn	509	509	0	0.0
			.hbn_noinit	260	260	0	0.0
			.init	342	342	0	0.0
			.init_array	144	144	0	0.0
			.psram	0	0	0	0.0
			.riscv.attributes	47	47	0	0.0
			.rodata	116744	116744	0	0.0
			.rsvd	3188	3188	0	0.0
			.shstrtab	293	293	0	0.0
			.stack	2048	2048	0	0.0
			.strtab	565071	565071	0	0.0
			.symtab	171664	171664	0	0.0
			.tcm_data	36	36	0	0.0
			.tcmcode	3262	3262	0	0.0
			.text	957032	957034	2	0.0
		bl702+rpc		0	0	0	0.0
			(read only)	3262	3262	0	0.0
			(read/write)	1284579	1284579	0	0.0
			.bleromro	6296	6296	0	0.0
			.bleromrw	124	124	0	0.0
			.boot2	688	688	0	0.0
			.bss	75150	75150	0	0.0
			.bss_psram	29936	29936	0	0.0
			.comment	48	48	0	0.0
			.data	4800	4800	0	0.0
			.debug_abbrev	1644410	1644410	0	0.0
			.debug_aranges	140632	140632	0	0.0
			.debug_frame	511956	511956	0	0.0
			.debug_info	41811900	41811901	1	0.0
			.debug_line	5631375	5631375	0	0.0
			.debug_loc	3559772	3559772	0	0.0
			.debug_ranges	381824	381824	0	0.0
			.debug_str	3853711	3853711	0	0.0
			.hbn	509	509	0	0.0
			.hbn_noinit	260	260	0	0.0
			.init	342	342	0	0.0
			.init_array	160	160	0	0.0
			.psram	0	0	0	0.0
			.riscv.attributes	47	47	0	0.0
			.rodata	130136	130136	0	0.0
			.rsvd	3188	3188	0	0.0
			.shstrtab	293	293	0	0.0
			.stack	2048	2048	0	0.0
			.strtab	624244	624244	0	0.0
			.symtab	189472	189472	0	0.0
			.tcm_data	36	36	0	0.0
			.tcmcode	3262	3262	0	0.0
			.text	1030732	1030734	2	0.0
linux	chip-tool-ipv6only	arm64	(read only)	10429892	10429892	0	0.0
			(read/write)	706353	706353	0	0.0
			.bss	33953	33953	0	0.0
			.data	2768	2768	0	0.0
			.data.rel.ro	650632	650632	0	0.0
			.dynamic	560	560	0	0.0
			.got	13896	13896	0	0.0
			.init	24	24	0	0.0
			.init_array	208	208	0	0.0
			.rodata	518164	518164	0	0.0
			.text	8256164	8256164	0	0.0
	thermostat-no-ble	arm64	(read only)	2390428	2390428	0	0.0
			(read/write)	143633	143633	0	0.0
			.bss	55377	55377	0	0.0
			.data	1816	1816	0	0.0
			.data.rel.ro	77256	77256	0	0.0
			.dynamic	560	560	0	0.0
			.got	5176	5176	0	0.0
			.init	24	24	0	0.0
			.init_array	440	440	0	0.0
			.rodata	144436	144436	0	0.0
			.text	2003088	2003088	0	0.0
mbed	lock-app	CY8CPROTO_062_4343W+release	(read only)	6224	6224	0	0.0
			(read/write)	2452232	2452232	0	0.0
			.bss	215028	215028	0	0.0
			.data	5872	5872	0	0.0
			.text	1414876	1414876	0	0.0
nrfconnect	all-clusters-app	nrf52840dk_nrf52840	(read/write)	1183451	1183451	0	0.0
			bss	144441	144441	0	0.0
			rodata	144396	144396	0	0.0
			text	815708	815708	0	0.0
	all-clusters-minimal-app	nrf52840dk_nrf52840	(read/write)	1162119	1162119	0	0.0
			bss	143668	143668	0	0.0
			rodata	135968	135968	0	0.0
			text	803600	803600	0	0.0
telink	light-switch-app	tlsr9518adk80d	(read/write)	789372	789372	0	0.0
			bss	72480	72480	0	0.0
			noinit	43520	43520	0	0.0
			text	553142	553146	4	0.0
	lighting-app	tlsr9518adk80d	(read/write)	811484	811484	0	0.0
			bss	73328	73328	0	0.0
			noinit	43520	43520	0	0.0
			text	571366	571368	2	0.0
	ota-requestor-app	tlsr9518adk80d	(read/write)	819420	819420	0	0.0
			bss	74236	74236	0	0.0
			noinit	43520	43520	0	0.0
			text	577548	577550	2	0.0