Merge "Add keymaster_security_level_t for attestation." into nyc-dev am: 64e76f8
am: f7b432e

* commit 'f7b432e6f528f70df7a012bfa82652fd04609c0e':
  Add keymaster_security_level_t for attestation.