Merge changes from topic "tc_change_23050307_56" into udc-dev-plus-aosp am: 0c0b472cf3 am: 5ef5f66d02

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

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