am f1654c60: Merge "Add initial Keymaster 1.0 tests"

* commit 'f1654c6015dbf30b7dae3575d787ca141ae84028':
  Add initial Keymaster 1.0 tests