[automerger skipped] Fix lunch choices for git_main am: cff9d02a9c am: 84c58b5290 am: eca436aaf1 -s ours

am skip reason: Merged-In I81187827ee2a98a9efa19a0f729f1c7d17c01aaa with SHA-1 a3a8befa95 is already in history

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

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