Merge changes If3dbe234,Ia1299759 into main am: 67b67908a1 am: 6587d6c31f

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

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