Merge "IPANAT: Not add embedded connections in AP+STA mode"