[automerger skipped] Merge "Dropping NAT-T keepalive packet from APF" into qt-dev
am: 7afeb17f -s ours
am skip reason: change_id Ib3416ec37f0de12daf882068e00673ad60438c1a with SHA1 2493db83 is in history
Change-Id: I16743a86151aca1d4630fea8dc576230d0cb9aaa