Merge "Use import for testAndCleanup" am: 1108b129df

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

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