[automerger skipped] Merge history of packages/Connectivity am: 2afd0986d3 am: 395514fa3d -s ours am: 372cc1c2a0 -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/+/14700782

Change-Id: Iae2f303d67e010c3fd8dfa1a5d9a3d9a07863f54