Merge changes from topic "import_v121_0_6103_2" into main am: 4ca084bad6 am: c9ca35bc47 am: 610cdb81e9

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

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