Merge "Fix IpSecAlgorithmTest on S" am: 0084591e94 am: 89213602ee

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1806806

Change-Id: I91f8ef5490da3cf9158630691bd470db02531172