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

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

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