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

Change-Id: I0fdde14e4a1e2031432d3e178ed21a2ef007a0aa