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

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

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