[automerger skipped] Merge "Merge history of packages/Connectivity" into sc-v2-dev-plus-aosp am: 4b6d3cabbb -s ours

am skip reason: Merged-In Ie82d0fb34bda77543e31c82660c6f315efa87f62 with SHA-1 cd4d44cbf6 is already in history

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

Change-Id: Iaff5f42afeb946585b08f4c9aae60278b2519119