Fix merge error causing test failures. (#14773)
Fix merge error causing test failures. (#14773)

Merging https://github.com/project-chip/connectedhomeip/pull/14487
violated the API contract that was established in
https://github.com/project-chip/connectedhomeip/pull/14688, so we
started failing tests.  The two PRs had never been run through CI
together.
nestlabs/connectedhomeip,nestlabs/connectedhomeip,project-chip/connectedhomeip,project-chip/connectedhomeip,project-chip/connectedhomeip,project-chip/connectedhomeip,nestlabs/connectedhomeip,nestlabs/connectedhomeip,nestlabs/connectedhomeip,project-chip/connectedhomeip,nestlabs/connectedhomeip,nestlabs/connectedhomeip,project-chip/connectedhomeip