Merge changes from topic "ks2_with_keymint"

* changes:
  Keystore 2.0 SPI: Use KeyMint AIDL types.
  Keystore 2.0 SPI: Make Recoverable keystore tolerate the Keystore 2.0 SPI