am 23d4a742: Revert "Revert "Refactor GoogleKeymaster\'s operation table to a new class.""

* commit '23d4a742109fa29d6be20d3dc56a1b48797fe7b2':
  Revert "Revert "Refactor GoogleKeymaster's operation table to a new class.""