Merge changes I46a4b3ee,I01b0a6ab am: 3045fe697b am: e0bcd7f3ea

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

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