Merge changes from topic "cherrypicker-L46000000960545507:N69100001367007678" into udc-dev am: c50ead2707 am: bf8c8bc1b2

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

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