Merge changes from topic "cherrypicker-L21100000961067008:N34400001375316978" into udc-dev am: 15e4b5ccfb

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

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