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

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

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