[automerger skipped] Merge changes I178ed839,Iff78d02a into udc-dev am: 177dade553 -s ours

am skip reason: Merged-In Ic0f19adf5d9bde7cdab766e49cf677b319a2219b with SHA-1 98a44bcb29 is already in history

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

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