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

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

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