Merge changes I62c990d0,I413bdb76,I020ba48e into main am: 3e07102814

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

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