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

Change-Id: Ibcbb62c0ca08e9ed489d167e3ddd16b3c38bff6a