Merge changes I0be59107,Iaf5f3f9b into main am: f116ee1627 am: 775172ad21

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

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