Merge "identity: Fix attestation and documentation problems." into android11-tests-dev