Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement"