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

* commit 'a65c7cf1a61e5915bb2d71c68952d55bb75f01fa':
  goldfish_setup:  remove permissive_or_unconfined()