[automerger skipped] Fix lunch choices for git_main am: 39ed5d7ba3 am: fa686932da -s ours am: 41b4712ec1 -s ours

am skip reason: Merged-In I5baf9db894c35fd96d54207b2924d15b05266439 with SHA-1 39ed5d7ba3 is already in history

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

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