[automerger skipped] Fix lunch choices for git_main am: 887a76e65a am: 7c96dc134e am: 4f0b30d605 -s ours

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

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

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