am df5eec89: Merge "Revert "Revert "Report keymaster0 keys as hardware-backed, origin unknown.""" into mnc-dev

* commit 'df5eec89e97846edd3bda871e55dc03266476b62':
  Revert "Revert "Report keymaster0 keys as hardware-backed, origin unknown.""