Merge "Update Keystore to use keymaster2 HAL."
am: fd50293cd5

* commit 'fd50293cd5f91936ea954b0556f3f434243adf27':
  Update Keystore to use keymaster2 HAL.