[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#359

Merged

mssonicbld merged 2 commits intoAzure:202305from

mssonicbld:sonicbld/202305-merge

May 2, 2024

Commits on May 1, 2024

[submodule] Update submodule sonic-swss to the latest HEAD automatically (#18838)
mssonicbld
authored

Commits on May 2, 2024

Merge branch '202305' of https://github.com/sonic-net/sonic-buildimage into 202305
mssonicbld
committed