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

Change-Id: Ifdfe10bc722ffc78a99bb1dd37d0d1d0afa897f1