Merge changes from topic "cherrypicker-L41300000961223553:N33900001378015350" into udc-dev am: dbb36eca72

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

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