[automerger skipped] Fix lunch choices for git_main am: d319529aed am: 7740cd8acb am: 3d76e467b7 -s ours

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

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

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