aml_ips_340914200 (11045971,com.google.android.ipsec)
Snap for 10476488 from 3da570666e387ed69d761540aefe840cae4b6cce to mainline-ipsec-release

Change-Id: I44ef603cdbe9fe57bd7c9bbe59c568e0f1ce209c