Merge "Reduce time needed to run test." into main am: da42fec566

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

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