Merge changes Id26a24c8,I3b6ac97e into main am: e8184501b8

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

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