Merge changes from topic "roll_forward_testtetherclatudp" am: 9b51a75d6e

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

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