Merge changes I25096f4c,I40ba22ab am: 9e31b74ee5 am: 93cc3ccad4

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

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