aml_ips_340914280 (11207227,com.google.android.ipsec)
Snap for 10486386 from f53d7665904bf7cb393a2833506bb48a8f42b008 to mainline-ipsec-release

Change-Id: Ibe3809654db213aea4820b18194a5c35f1eb76b9