Backport some helpers in ConnectivityServiceTest. am: be317557fe

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425318

Change-Id: I7ffa0faf61ccc7238b65e0f9ed863939e5089f06