[automerger skipped] Merge changes from topic "cherrypicker-L86300000960661534:N86700001369044773" into udc-dev am: 28c597c265 am: 0185601f1a am: 17c9370e99 -s ours

am skip reason: Merged-In Ia1884f37739a20d871dd0024cc72cb18c083dc8e with SHA-1 78b8ff8493 is already in history

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

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