Merge changes Id392a33c,Iabf8875f into main am: e1cd8461a3 am: d74d671c20

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

Change-Id: I8d501cf094a2009f00429735bfcb796aa6128423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/build_id.mk b/core/build_id.mk
index bed839f..8a68056 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=MAIN
+BUILD_ID=UDC