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

Change-Id: I8a690e6f2963308c9281efc21085e213a02d588d