Merge "Fix the NUD probe counter in dumpsys of link metrics" into sc-dev