[automerger skipped] Fix lunch choices for git_main am: bb35cfaea7 am: d03c28f14c -s ours am: c4c78a25d6 -s ours

am skip reason: Merged-In I47590aaf84bd2481d53c04889c2963e02b7a816d with SHA-1 bb35cfaea7 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994

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