Merge changes Ibd38e3c0,I0e9f52aa into main am: 7475acf7e2

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

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