am 21654f9e: Merge "Add exception types for NfcEe operations."

# Via Android (Google) Code Review (1) and Martijn Coenen (1)
* commit '21654f9efc66aed05d35f618aa953d05e78eecad':
  Add exception types for NfcEe operations.