Merge "Utility improvements for handling V6 encap and XFRM_MIGRATE" am: ab1bf30fb8

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2392965

Change-Id: Ia6c93611187a0a2e9070d43a57242da671efdb7c
Signed-off-by: Automerger Merge Worker <[email protected]>