[automerger skipped] Merge changes from topic "cherrypicker-L55500000960281927:N08100001362972784" into udc-dev am: 050b246600 -s ours

am skip reason: Merged-In Ie07603ea51dda1ffdeb15f753bda7892d9137766 with SHA-1 508e508ca6 is already in history

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

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