Merge "Use import for testAndCleanup" am: 1108b129df am: 102fc3c172

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

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