Merge "ConnectivityServiceTest: fix flakyness" am: a82cac1452
am: 004f36d5bc

Change-Id: Id8468bd8e38927341cdbebe2925c0bfd4bb37c0c