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

Change-Id: Ie06fe25511ddb6d1bf735701d896b848a399b97f