[automerger skipped] Merge changes from topic "cherrypicker-L46000000960545507:N69100001367007678" into udc-dev am: c50ead2707 -s ours

am skip reason: Merged-In I2b4b6a13c048c20beef52b1f43b9e21aca0c637a with SHA-1 278db58bf5 is already in history

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

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