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

* commit '3a836e74a9ed97c3b1575da9b6f7ddc788422f86':
  goldfish_setup:  remove permissive_or_unconfined()