[automerger skipped] Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" into sc-dev am: 7e982787e1 -s ours
am skip reason: Merged-In I2e3c4fe735b3374b2ff6d23850970e36c0aafda5 with SHA-1 cf4d2eb208 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14667143
Change-Id: Id39a25cc0292dcbdfc91df1347433f278f5954bd
This commit is contained in: