[automerger skipped] Fix lunch choices for git_main am: 95edaa292e am: 1cd429935b -s ours

am skip reason: Merged-In I400392ba9cf7e6d35af78d6b668d52abee27497d with SHA-1 95edaa292e is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2811313

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