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

am skip reason: skipped by user reminv

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

Change-Id: I6f4023633a4561f1bf68e34c2c751d2fe1d41733