Merge "Add attestation API to Android KeyStore." into nyc-dev