Merge changes I9bbff5be,I270b751d,Ibf1bd267 am: fbcd08a28d am: f094ab6db5

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

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