aml_ips_341611000 (11398421,com.google.android.ipsec)
Snap for 11397440 from 889ef8af4596a58cc99c2a4b99ebfc62a6c8f6d2 to mainline-ipsec-release

Change-Id: Iccae89781bc1f4ffc44699875e5890f303e746b8