Small changes needed to support CTS testing.

Bug: 268989471
Test: "atest android.net.wifi.sharedconnectivity.cts.SharedConnectivityTest"
Change-Id: Iac3ee235ec4aff0c90f4ea3e415e98265520c26b
3 files changed