aml_ips_341611000 (11398421,com.google.android.ipsec)
Snap for 10453563 from 855173504f4e3a444945a739f3a769713262a499 to mainline-ipsec-release

Change-Id: I2a4302d690219b8565408326ff017bb1f34c25a6