[automerger skipped] Merge "Add devices suitable for single-arch module builds" into mainline-prod am: 04a80cd7 -s ours

am skip reason: Change-Id Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b with SHA-1 82996e4b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13128030

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I111b7885809f2012d706bed5cb7d41148bef18e4