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

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

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