Merge changes I58cd6145,I32299ce8,I0433459e am: fabb53a881 am: a3fb4620dd

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

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