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

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

Change-Id: I10b8cf5ebe2cdaee18f22f82aa47100c0ea9ff4c