am 5d47a481: Merge "goldfish_setup:  remove permissive_or_unconfined()"

* commit '5d47a481fb88ca4dba853d064eb5dfd671f9b68a':
  goldfish_setup:  remove permissive_or_unconfined()