Hotfix: fix conflict between #10434 and #10909

[kghost]

Problem

Compile fail

Change overview

Fix it

Testing

Running unit-tests

[github-actions]

PR #10953: Size comparison from 341c00d to b9c91d3

8 builds (for k32w, p6, qpg, telink)

platform	target	config	section	341c00d	b9c91d3	change	% change
k32w	lock-app	k32w061+debug	.bss	69196	69196	0	0.0
			.data	1864	1864	0	0.0
			.text	515140	515140	0	0.0
	shell	k32w061+debug	.bss	63256	63256	0	0.0
			.data	672	672	0	0.0
			.text	359572	359572	0	0.0
	lighting-app	k32w061+se05x+release	.bss	78712	78712	0	0.0
			.data	1900	1900	0	0.0
			.text	613776	613776	0	0.0
p6	lock-app	default	.bss	67176	67176	0	0.0
			.data	2416	2416	0	0.0
			.heap	963752	963752	0	0.0
			.text	1126088	1126088	0	0.0
qpg	lighting-app	qpg6100+debug	.bss	52416	52416	0	0.0
			.data	1000	1000	0	0.0
			.text	485044	485044	0	0.0
	lock-app	qpg6100+debug	.bss	51360	51360	0	0.0
			.data	956	956	0	0.0
			.text	461264	461264	0	0.0
	persistent-storage-app	qpg6100+debug	.bss	27752	27752	0	0.0
			.data	372	372	0	0.0
			.text	149900	149900	0	0.0
telink	lighting-app	tlsr9518adk80d	bss	69940	69940	0	0.0
			noinit	33216	33216	0	0.0
			text	457672	457672	0	0.0

4 builds (for efr32)

platform	target	config	section	341c00d	b9c91d3	change	% change
efr32	lighting-app	BRD4161A	.bss	113684	113684	0	0.0
			.data	1752	1752	0	0.0
			.text	735816	735816	0	0.0
	lock-app	BRD4161A	.bss	111540	111540	0	0.0
			.data	1712	1712	0	0.0
			.text	715080	715080	0	0.0
	window-app	BRD4161A	.bss	111852	111852	0	0.0
			.data	1716	1716	0	0.0
			.text	715876	715876	0	0.0
	lighting-app	BRD4161A+rpc	.bss	130188	130188	0	0.0
			.data	1852	1852	0	0.0
			.text	723232	723232	0	0.0

4 builds (for mbed)

platform	target	config	section	341c00d	b9c91d3	change	% change
mbed	all-clusters-app	CY8CPROTO_062_4343W+release	.bss	179604	179604	0	0.0
			.data	5192	5192	0	0.0
			.heap	851648	851648	0	0.0
			.text	1251552	1251552	0	0.0
	lighting-app	CY8CPROTO_062_4343W+release	.bss	171060	171060	0	0.0
			.data	5464	5464	0	0.0
			.heap	859920	859920	0	0.0
			.text	1219256	1219256	0	0.0
	lock-app	CY8CPROTO_062_4343W+release	.bss	169980	169980	0	0.0
			.data	5432	5432	0	0.0
			.heap	861032	861032	0	0.0
			.text	1197280	1197280	0	0.0
	pigweed-app	CY8CPROTO_062_4343W+release	.bss	11760	11760	0	0.0
			.data	4360	4360	0	0.0
			.heap	1020328	1020328	0	0.0
			.text	103064	103064	0	0.0

12 builds (for esp32, nrfconnect)

platform	target	config	section	341c00d	b9c91d3	change	% change
esp32	all-clusters-app	c3devkit	.dram0.bss	58232	58232	0	0.0
			.dram0.data	16464	16464	0	0.0
			.flash.rodata	198072	198072	0	0.0
			.flash.text	874742	874742	0	0.0
			.iram0.text	57564	57564	0	0.0
		m5stack	.dram0.bss	60744	60744	0	0.0
			.dram0.data	32084	32084	0	0.0
			.flash.rodata	206832	206832	0	0.0
			.flash.text	905895	905895	0	0.0
			.iram0.text	125115	125115	0	0.0
nrfconnect	lighting-app	nrf52840dk_nrf52840	bss	112136	112136	0	0.0
			rodata	97100	97100	0	0.0
			text	577204	577204	0	0.0
	lock-app	nrf52840dk_nrf52840	bss	111208	111208	0	0.0
			rodata	93500	93500	0	0.0
			text	558764	558764	0	0.0
	pigweed-app	nrf52840dk_nrf52840	bss	51824	51824	0	0.0
			rodata	45776	45776	0	0.0
			text	339456	339456	0	0.0
	pump-app	nrf52840dk_nrf52840	bss	111308	111308	0	0.0
			rodata	94700	94700	0	0.0
			text	561868	561868	0	0.0
	pump-controller-app	nrf52840dk_nrf52840	bss	111204	111204	0	0.0
			rodata	93476	93476	0	0.0
			text	558508	558508	0	0.0
	shell	nrf52840dk_nrf52840	bss	109072	109072	0	0.0
			rodata	72536	72536	0	0.0
			text	520324	520324	0	0.0
	lighting-app	nrf52840dk_nrf52840+rpc	bss	108376	108376	0	0.0
			rodata	87876	87876	0	0.0
			text	550396	550396	0	0.0
		nrf5340dk_nrf5340_cpuapp	bss	113508	113508	0	0.0
			rodata	92340	92340	0	0.0
			text	506676	506676	0	0.0
	lock-app	nrf5340dk_nrf5340_cpuapp	bss	112580	112580	0	0.0
			rodata	88760	88760	0	0.0
			text	488228	488228	0	0.0
	shell	nrf5340dk_nrf5340_cpuapp	bss	110056	110056	0	0.0
			rodata	67180	67180	0	0.0
			text	440936	440936	0	0.0