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

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

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