am 7d3707f2: am 4ca5ab5d: am 4be75b37: Merge "qemu_props:  remove permissive_or_unconfined()"

* commit '7d3707f21377e70c9202efa5db3983526cd02e54':
  qemu_props:  remove permissive_or_unconfined()