[automerger skipped] Merge "Merge history of packages/Connectivity" am: e107f26c5d am: d9338f3219 -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/+/1714872

Change-Id: I9839115a1c8d9d1cee469ca21f174aa89dd5e75b