aml_ips_340914280 (11207227,com.google.android.ipsec)
Snap for 10486386 from aae15501728ff6794574065965dc63612fb07435 to mainline-ipsec-release

Change-Id: I7835d45e5513c1aee8bc8b81219d06b8f2f66df4