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

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

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