Fix lunch choices for git_main am: 887a76e65a am: 7c96dc134e

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

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