Merge changes I47b91c0c,I630c0e49 into main am: 1b5d601d0c am: 37a530ab8b

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

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