am c217adaf: am 9db6e4d7: am 5aeb0853: Merge "Enforce tag types in KeymasterArgument classes"

* commit 'c217adaf6756003684d195713dda8a9b215f5dbc':
  Enforce tag types in KeymasterArgument classes