Merge "Handle WPA3-Enterprise connection event correctly" into tm-mainline-prod