am 0387a7fd: Merge "Add calls for SELinux MAC checks in keystore."

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