[automerger skipped] Merge changes I25096f4c,I40ba22ab am: 9e31b74ee5 am: 93cc3ccad4 am: 72277fe2d9 -s ours

am skip reason: Merged-In I555ad1ed687632cfe8a7e30283f80e80956fc1d4 with SHA-1 5e50b4897d is already in history

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

Change-Id: I6b559bf44969c2a957eb5308ce82b534e02df187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>