Merge "Fix broken test_lunch.py" am: b4f831d56b am: 046230b625

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

Change-Id: I48da371a06f61b44954b90faac6eb69b9b14669b
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 ba5ca42..a489788 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=AOSP.MASTER
+BUILD_ID=TM