Merge changes I2388220a,I5f282160 into main am: f45f40717b

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

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