Merge changes Ia3ed3c1f,Ib802862d am: f517333c4d am: 806d703eea

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

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