[automerger skipped] Backport some helpers in ConnectivityServiceTest. am: be317557 am: 04daf7b1 -s ours am: 8012af40 -s ours am: 805240ba -s ours

am skip reason: Merged-In I827543751dbf5e626a24ec02cd6f50b423f5f761 with SHA-1 4d3a0c24 is already in history

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

Change-Id: Ib5330fe8dd8e0aa017eb454051d6dbf98bcc8be6