Merge "Dropping NAT-T keepalive packet from APF"
am: c4104f029f

Change-Id: Icef6ec0d4ce20053f9e0aeed53a265747e187acf