am c2120744: Merge "Wrap incomplete keymaster1 implementations with sw keymaster." into mnc-dr-dev

* commit 'c2120744da8d0612ad54484b314f94e1e6e3a167':
  Wrap incomplete keymaster1 implementations with sw keymaster.