Merge "Correct the error type in the report for goldfish AVD type." am: 5ce06f5233

Original change: https://android-review.googlesource.com/c/platform/tools/acloud/+/1560474

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2724724a85a6791514785ecd85cb4f354efc58da