[automerger skipped] Fix lunch choices for git_main am: d319529aed am: a1782fb8fd -s ours am: 2fa1a71803 -s ours

am skip reason: Merged-In Iba97af30d474696210b68f5b35604bf04b953896 with SHA-1 d319529aed is already in history

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2811373

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