Merge changes Ibd38e3c0,I0e9f52aa into main am: 7475acf7e2 am: 481d6d4acf

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

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