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

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

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