Merge changes Ifb7305be,I74d9d074,Ia0f6b67c,Ib14f444b am: cfc74d42b4

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

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