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

[automerger skipped] Merge "DO NOT MERGE  Designate udc-dev* branches as UDC." into udc-dev am: fb48efce -s ours am: 64b88c84 -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: I9f97e274a32a543124bdd8ab398dd9ebcc9f8d41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>