Merge "Put the emulator_x86_arm board back" into main am: f8a21bb9 am: 46e90099 am: c5623af9

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



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