aml_ips_340914200 (11045971,com.google.android.ipsec)
Snap for 10453563 from e3b913f679647534152b51aed8f2338fd746f369 to mainline-ipsec-release

Change-Id: I2f5c0117bb7831543ab650c1fcdb73ec2b419fc4