Merge "Put the emulator_x86_arm board back" into main am: f8a21bb9 am: a69d54b5

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



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