am 0487ab1e: am 58aeaed9: Merge "goldfish_logcat:  remove permissive_or_unconfined()"

* commit '0487ab1ec0097d6c617a13f19609f58c6a5987c0':
  goldfish_logcat:  remove permissive_or_unconfined()