aml_ips_341611000 (11398421,com.google.android.ipsec)
Snap for 11397440 from d5f27a5ff886cc5ec7c40508d3d2e3f64b849e4d to mainline-ipsec-release

Change-Id: I1a56d326b8ce8b1ada1d92e64e221a8872f8cf63