aml_ips_340914280 (11207227,com.google.android.ipsec)
Snap for 10453563 from 15a6e9345646c7880d35079589573506387447bd to mainline-ipsec-release

Change-Id: Ia01c9bc993fbb56b2c97de747312a0572e7e938f