[automerger skipped] Merge history of packages/Connectivity am: 2afd0986d3 am: 395514fa3d -s ours

am skip reason: skipped by user baligh

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

Change-Id: Ibfcf5aee5b17caad5bf0b327e55af49b5410be83