am 8c46a913: (-s ours) Add authorization enforcement to AndroidKeymaster.

* commit '8c46a913e4585d7355cabf8c409117c669429c6a':
  Add authorization enforcement to AndroidKeymaster.