[automerger skipped] Fix lunch choices for git_main am: d14954014d am: 98ce85b58b -s ours

am skip reason: Merged-In I59f0d19756f280ad71e3a0755a6c2ccc62f5060c with SHA-1 d14954014d is already in history

Original change: https://android-review.googlesource.com/c/device/generic/car/+/2811453

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