[automerger skipped] Fix lunch choices for git_main am: 644a59b607 am: 3d2670dcaa -s ours am: d6ddf5dc46 -s ours

am skip reason: Merged-In I7b31c905be1d994de52652162c0bd2bc8c5b8c65 with SHA-1 644a59b607 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2811080

Change-Id: I834f9b7781f81e677f671e78bdf04d920002ba53
Signed-off-by: Automerger Merge Worker <[email protected]>