Merge changes Icecb889a,Id06116ad into main am: 3a5b37a87c

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

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