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

Change-Id: I186fdefc075cd2ce2ac5f22dbff1dca722c4ecc6