Merge changes I197fbfb8,I6375e771,I48536927 am: d3e793d8a1 am: b64fbc53f2

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

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