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

[automerger skipped] DO NOT MERGE  Designate udc-dev* branches as UDC. am: 21b113cb -s ours am: 6048b030 -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: Iec5aaf950e205aad0f5f150a067725e716a8319a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>