[automerger skipped] Fix lunch choices for git_main am: 6b5c8c3fff am: 3f6bdceb94 -s ours am: f0a632aaa3 -s ours

am skip reason: Merged-In I293119e6bb0e62d12b890899e7aa02dc12de7619 with SHA-1 6b5c8c3fff is already in history

Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2811195

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