aml_ips_340914280 (11207227,com.google.android.ipsec)
Snap for 10453563 from 5d4c782b1fedfbf339e7e8a3b5547dd5b29a9526 to mainline-ipsec-release

Change-Id: I1b63cdef2f01241640169f65bbfc69163ed67087