[automerger skipped] Merge framework-connectivity impl and stub targets am: e70cd84601 am: b6edc1a9b9 -s ours am: b3f480065e -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: Ic593a078b0b370d05a47006c4bfb8704032db5f0
This commit is contained in: