Merge changes I47b91c0c,I630c0e49 into main am: 1b5d601d0c

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

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