[automerger skipped] Merge "Support adding NATT keepalive packet filter" into qt-dev
am: 78bc2fb752 -s ours
am skip reason: change_id Idaa7238a5c9acdae9f6cff13095ee9436c7c92c8 with SHA1 7d64434c73 is in history

Change-Id: I0db6221a54e4aba83fc792561e48c9d448163239