Merge "Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" am: 4d492d89 am: 24f14ed2" into qt-dev-plus-aosp