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

am skip reason: Merged-In I49809989a1961dba170de521c469bdc17ecef282 with SHA-1 86ed65c422 is already in history

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

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