[automerger skipped] Merge changes Ib8637100,I33612650 am: d4c644cf4d am: bd9ed64c5d -s ours

am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: I54db0fac61cf527cb892980b3062bfdf1f905784