Address remaining comments on aosp/1607893

Test: ConnectivityServiceTest
Change-Id: Icf70b20624604bfade37804311a77ef6be564c09
1 file changed