[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#85

Merged

mssonicbld merged 2 commits intoAzure:202205from

mssonicbld:sonicbld/202205-merge

Aug 18, 2023

Commits on Aug 17, 2023

Updated PG headroom settings for 40g port speed (#16038) (#16177)

mssonicbld
and
vmittal-msft
authored

Commits on Aug 18, 2023

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