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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie49bce2b4c74c89098253dfdbea868cfaadcf6d8