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

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

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