[automerger skipped] Merge "Mock connectivity resources in integration tests" am: d21f0426e7 am: 61eb78e1ee -s ours

am skip reason: Merged-In Ic33d897690a8ea84a78c01dc5f2b2e2c473d57df with SHA-1 0a37e72f0c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1785907

Change-Id: I0c11251fb3ebb154d1382eddd64dd978a5e5a618