Merge changes Id26a24c8,I3b6ac97e into main am: e8184501b8 am: c442143936

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

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