Merge "Merge android13-tests-dev" am: fd479a9d45

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

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