aml_ips_340914200 (11045971,com.google.android.ipsec)
Snap for 10486386 from 676812bcb3e04cc645bd5429b3e78f2e1ce46213 to mainline-ipsec-release

Change-Id: I00ffaa67ee2d1e55dcdcb289fa9ff86a55fbb3b5