am e24fbbae: am bbf064bb: Merge "Add calls for SELinux MAC checks in keystore."

* commit 'e24fbbaef5bd3d7e4f473d2a7cfa114bfefe0bca':
  Add calls for SELinux MAC checks in keystore.