Merge changes I7c17ab51,I5bd4acb4,I93270f00

* changes:
  Add KM_ERROR_HARDWARE_TYPE_UNAVAILABLE to KeymasterDefs
  Keystore SPI: Deprecate encryption flag.
  Keystore 2.0: Deprecate Credential prefixes.