Merge "Add some tests back which were removed for fixing kotlin nullable errors" into main am: 760bcac429

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

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