Merge "Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb am: ed0f1438e0" into qt-r1-dev-plus-aosp
am: c4ca1f2ead

Change-Id: Ie3def4fb2e5fd98f2f3d77ecbec98bd495aadeeb