Merge "Fix lunch choices for git_main" into main am: 3d79e54f am: bf665a1f

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



Change-Id: Ibdb553e1c9e63a60b69d7b7c8e8a796d90bc1c74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>