Merge "Adjust key attestation test to conditionally check for AAID" into oc-dev