Merge changes Icb1f60b3,I935f2383

* changes:
  Allow keystore to talk to keymint
  Add policy for the security compatibility hal service.