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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e46352af25234538b4ad1aa578fe7c1af73d420