[automerger skipped] Fix lunch choices for git_main am: f544c411ce am: b4c3501065 am: b30baec39c -s ours

am skip reason: Merged-In I1492ec879e2131fbe5c7110573fd932712251a31 with SHA-1 e36683f026 is already in history

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

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