Merge changes Ibd38e3c0,I0e9f52aa into main am: 7475acf7e2 am: 8819f03f5c

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

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