Merge changes I471014c1,I5365c4da into main am: 60cc6a145b am: a28380f6aa

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

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