Merge changes I197fbfb8,I6375e771,I48536927 am: d3e793d8a1

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

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