Merge changes from topic "tc_change_2305100725_23" into udc-dev am: 0d235e3f59 am: 438a601c8a

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

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