[automerger skipped] Merge "Improve documentation of...

[automerger skipped] Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" into sc-dev am: 7e982787 -s ours am: 31500fe8 -s ours

am skip reason: Merged-In I2e3c4fe735b3374b2ff6d23850970e36c0aafda5 with SHA-1 d4af5afd is already in history

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

Change-Id: Iff09232c029712fd1627a1d5677b888b05ebd25d