Fix lunch choices for git_main am: e8176bbf5e am: 7152e78d8b

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

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