[automerger skipped] Backport some helpers in ConnectivityServiceTest. am: be317557fe am: 04daf7b175 -s ours

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

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

Change-Id: Ia26d7b281695355b9d96a4689fa6edd28b9355b0