[automerger skipped] Backport some helpers in ConnectivityServiceTest. am: 853504c524 am: 646fa39db0 -s ours

am skip reason: skip tag Change-Id I827543751dbf5e626a24ec02cd6f50b423f5f761 with SHA-1 bb6b62a41e is already in history

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

Change-Id: Ia26d7b281695355b9d96a4689fa6edd28b9355b0
tree: a5eb007f22875a587b8ffd1f8b9b7ac3a5f04725
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS