Merge changes Iace4a45c,I007d3bab

* changes:
  microdroid: Set mls_cats to 1
  Add mls_cats property to se_policy_conf