Merge changes I29f7d2b4,Ie2aa7529 am: d837becc15 am: b6145a26d5 am: 044209938e

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

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