Merge changes I3da49704,I511f21a3 into main am: e25d55c638

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

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