Merge "Consistent PRODUCT_MODEL name for x86(_64) GSI" am: 094f9a7a6e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8ea051245e8dc25888289021a926e8c569bfa4d