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

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

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