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

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

Change-Id: I857da7375c992928758670b9031cb884a5a0eda8