Merge "Resolve the udc-extended-api diff from aosp" into udc-mainline-prod