Merge changes I8843ce7c,I90566998 into main am: 487191dbe6

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

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