Merge "DO NOT MERGE: Set TEE RootOfTrust fields in Attestation Extension" into stage-aosp-master am: 12ec6e3aee
am: 2f84aa0042  -s ours

Change-Id: Ic6145c718d010a978608fb6f523a5e04ab5c25a2