Merge changes I9bbff5be,I270b751d,Ibf1bd267 am: fbcd08a28d

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

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