Merge changes from topic "experimental-udp-encap" am: 5d8c3b1428 am: fde2ac343c

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

Change-Id: I537ff21994deb9cc6ffeeb98178c410c121b4085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>