[202311]Fix multi VLAN neighbor learning (#3049)#3064

prsunny merged 2 commits intosonic-net:202311sonic-net/sonic-swss:202311from

theasianpianist:202311-multi-vlantheasianpianist/sonic-swss:202311-multi-vlanCopy head branch name to clipboard