Merge "Push test-data to device" into main am: 106d76fb8a am: 883f69538b

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

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