Merge changes from topic "tc_change_2305100725_44" into tm-qpr-dev-plus-aosp am: 72ffec303d

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

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