Merge changes from topic "cherrypicker-L78000000960635464:N55900001368285360" into udc-dev am: 259bc8f538

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

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