[automerger skipped] Fix lunch choices for git_main am: 8e014ee491 am: b077a99f87 -s ours am: e256620bde -s ours

am skip reason: Merged-In I49809989a1961dba170de521c469bdc17ecef282 with SHA-1 8e014ee491 is already in history

Original change: https://android-review.googlesource.com/c/device/google/barbet/+/2810374

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