Merge "Use import for testAndCleanup" am: 1108b129df am: 102fc3c172 am: 35d610fd53 am: 552ee9bb1d

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

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