Merge changes I178ed839,Iff78d02a into udc-dev am: 177dade553

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

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