aml_ips_340914200 (11045971,com.google.android.ipsec)
Snap for 8570526 from 14c252498e7f03de8c5c6a65fdf1d7393b5ffcd6 to mainline-ipsec-release

Change-Id: Ibb58adb7950ed94c14cbc20c062c7eba2c06cabe