Fix lunch choices for git_main am: 39ed5d7ba3 am: e4c943ba27

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/2810697

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