Merge changes I25096f4c,I40ba22ab am: 9e31b74ee5

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

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