Merge "Advertise support for attest keys" am: 37f1cb21a5 am: 99cf4c6017 am: 060f6d812e

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/2026948

Change-Id: I2baa76496437fedaa50f31c9b8c98608a9521c65