[automerger skipped] Use TEE keymaster for ID attestation. am: 70c1a7883c  -s ours
am: 737e985d29  -s ours

Change-Id: Ied98bb902bec70d49509cd464209ead6f3da42c2