Merge "Resolve the udc-extended-api diff from aosp" into udc-mainline-prod am: 2522bc5fc7

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

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