Merge changes If3dbe234,Ia1299759 into main am: 67b67908a1

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

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