Merge changes from topic "tc_change_23042206_48" into udc-dev am: a9c7e2b27c

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

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