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

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

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

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

Change-Id: Ib63a475af9e881d88b8e5f57e9150621ed73b3d5