[automerger skipped] Merge "Merge history of packages/Connectivity" am: e107f26c5d am: d9338f3219 -s ours am: a986212f6a -s ours am: ebb497806b -s ours

am skip reason: Merged-In I7b5fd61cd551c7010f5b8ceabbfdd04f30f648dd with SHA-1 133d9178ec is already in history

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

Change-Id: I5249e288a5fd3c6800dea8603dea5e0220c355ec