Merge changes from topic "cherrypicker-L86300000960661534:N86700001369044773" into udc-dev am: 28c597c265 am: 0185601f1a

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

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