Fix lunch choices for git_main am: e8176bbf5e am: 143bc9196d

Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/2803044

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