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

Change-Id: If2a4d0b2458d5483a35a5267c3392e4ac9459edd