[automerger skipped] Fix lunch choices for git_main am: 644a59b607 am: 5be906235d am: 5bc21fedf4 -s ours

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

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

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