[automerger skipped] Merge framework-connectivity impl and stub targets am: e70cd84601 am: b6edc1a9b9 -s ours

am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: Ic5d6ddbc5bb5f47f54bac07975e15168548338e7