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

Change-Id: Iadc90122e2282cf1f26027bb74780a99bfa06a7c