Merge changes I47606693,Ia51bc3ab,Idef1a6d1,Ie6fbc3ee,I55064ee7 into main am: 4c701fbfa0

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

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