Merge changes I83ea92e3,I478d957b into main am: 11284d73a0 am: 02239b7e2a

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

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