[automerger skipped] Merge "Fix cannot create Nat-T keepalive on mobile data" am: c5bc106d53 am: 9ede677bb2 -s ours
am: 2c081c08ac

Change-Id: Ia721500882c2e398c080116bae2aeb7668ee3921