Merge changes from topic "target-sdk-tests" am: e051145522

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

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