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

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

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