[automerger skipped] Fix lunch choices for git_main am: 887a76e65a am: 61ab93316e -s ours

am skip reason: Merged-In Ia2c112e901d75c2fc251817732be63f7b6de9e72 with SHA-1 887a76e65a is already in history

Original change: https://android-review.googlesource.com/c/device/google_car/+/2811004

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