Fix flaky test resulting from the above fix.
Bug: 132950880
Fix: 133457081
Test: atest ConnectivityServiceTest
Merged-In: Ia2cc04b42288ea987483e5ab0e0a10093dc49502
Change-Id: Ia2cc04b42288ea987483e5ab0e0a10093dc49502
(cherry picked from commit c8289e40a4)