Merge "Use import for testAndCleanup" am: 1108b129df am: 2b935c1629

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

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