am 9421618b: Merge "Revert "Add calls for SELinux MAC checks in keystore.""

* commit '9421618b6b62b56a25f2d8f24edd2d5f68653f4e':
  Revert "Add calls for SELinux MAC checks in keystore."