aml_ips_341510000 (11275180,com.google.android.ipsec)
Snap for 10453563 from a0f224fe7030a56df7538dabe3fae13788c8d8fd to mainline-ipsec-release

Change-Id: I50cb97619c9d1fb82f3da0e4e4b2cdbf117a73b6