Merge "Add gsi_arm.mk product makefile" am: be7143fcb1 am: 38ae3fa1e7

Original change: https://android-review.googlesource.com/c/device/generic/common/+/1557688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I465302f4907e3c2ecff1f2fde932e3147422b887