[automerger skipped] DO NOT MERGE Designate udc-dev* branches as UDC. am: 21b113cb -s ours

am skip reason: Merged-In If49ce93abe63ad4e624a00454fcb3aa712f2d976 with SHA-1 fe63f28b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24816359



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