Merge changes Id390c6c5,Iaa00d4d3,Iba6f410c into main am: dad74776b8 am: c383e3f270

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

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