Fix lunch choices for git_main am: cff9d02a9c am: 84c58b5290

Original change: https://android-review.googlesource.com/c/device/generic/art/+/2811333

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