[automerger skipped] Merge changes from topic "cherrypicker-L34200000960946936:N30500001373342711" into udc-dev am: 6ad2c673a1 -s ours

am skip reason: Merged-In Icc23994c3ebc99da6043ed2d93540c44f53a150b with SHA-1 7f0af78c5e is already in history

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

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