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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7ff9e862882d49497b1ca1891a116b38e2c29b0