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

* commit '9db6e4d7a331f4e219d938074e50b2f9deca45f1':
  Enforce tag types in KeymasterArgument classes