Fix lunch choices for git_main

We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:406d7ae8afcea82f227278b2c20198ce94b143ca)
Merged-In: Iba97af30d474696210b68f5b35604bf04b953896
Change-Id: Iba97af30d474696210b68f5b35604bf04b953896
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index dca6c8d..e1fcebb 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -13,4 +13,4 @@
     $(LOCAL_DIR)/linaro_hikey960.mk
 
 COMMON_LUNCH_CHOICES := \
-    linaro_hikey960-userdebug
+    linaro_hikey960-trunk_staging-userdebug