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

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

Change-Id: Id7cdda6d37dbeed4259bb4c6a4c692657e2270d5