[automerger skipped] Fix lunch choices for git_main am: acfa31a673 am: d4c21d163a -s ours

am skip reason: Merged-In Ide29a6e31d1a07d7d395919cabee997dc3520ffc with SHA-1 acfa31a673 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bramble/+/2809727

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