[automerger skipped] Merge changes from topic "cherrypicker-L79500000960657219:N07500001368857425" into udc-dev am: 60437e59de -s ours am: 5c12fb7cb8 -s ours

am skip reason: Merged-In I09e780af25149162f16bd75410ddc50f160a0dab with SHA-1 ce44beb7aa is already in history

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

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