Merge "Fix documentation for config_optionalIpSecAlgorithms" am: 0bfaac54ab am: 9baae735b8 am: ce71ee6ed7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1482376

Change-Id: I40c9e8735025e7801c91eb50b2a8e770c0d23477