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

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



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