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

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

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