Merge changes I0b3ac7b4,I90385146 into main am: 7d1b5b56ce am: 583ab1b47d

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

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