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

* commit '4ca5ab5d4a51603ac7c33b2540d13184394e5ed9':
  qemu_props:  remove permissive_or_unconfined()