Merge "Revert "Advertise device id attestation for 64-bit goldfish"" into tm-dev