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

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

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