Fix lunch choices for git_main am: f544c411ce am: b4c3501065

Original change: https://android-review.googlesource.com/c/device/linaro/poplar/+/2811393

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